Implement P0403R1 - 'Literal suffixes for basic_string_view'. Requires clang 4.0 (specifically, r290744) git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@291457 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/string_view b/include/string_view index f98bbb5..20a4e06 100644 --- a/include/string_view +++ b/include/string_view
@@ -156,6 +156,11 @@ template <> struct hash<u32string_view>; template <> struct hash<wstring_view>; + constexpr basic_string<char> operator "" s( const char *str, size_t len ); // C++17 + constexpr basic_string<wchar_t> operator "" s( const wchar_t *str, size_t len ); // C++17 + constexpr basic_string<char16_t> operator "" s( const char16_t *str, size_t len ); // C++17 + constexpr basic_string<char32_t> operator "" s( const char32_t *str, size_t len ); // C++17 + } // namespace std @@ -749,6 +754,38 @@ return __do_string_hash(__val.data(), __val.data() + __val.size()); } + +#if _LIBCPP_STD_VER > 11 +inline namespace literals +{ + inline namespace string_view_literals + { + inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR + basic_string_view<char> operator "" sv(const char *__str, size_t __len) + { + return basic_string_view<char> (__str, __len); + } + + inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR + basic_string_view<wchar_t> operator "" sv(const wchar_t *__str, size_t __len) + { + return basic_string_view<wchar_t> (__str, __len); + } + + inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR + basic_string_view<char16_t> operator "" sv(const char16_t *__str, size_t __len) + { + return basic_string_view<char16_t> (__str, __len); + } + + inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR + basic_string_view<char32_t> operator "" sv(const char32_t *__str, size_t __len) + { + return basic_string_view<char32_t> (__str, __len); + } + } +} +#endif _LIBCPP_END_NAMESPACE_STD #endif // _LIBCPP_STRING_VIEW diff --git a/test/std/strings/string.view/string_view.literals/literal.pass.cpp b/test/std/strings/string.view/string_view.literals/literal.pass.cpp new file mode 100644 index 0000000..131bea9 --- /dev/null +++ b/test/std/strings/string.view/string_view.literals/literal.pass.cpp
@@ -0,0 +1,56 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03, c++11 +// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9 +// Note: libc++ supports string_view before C++17, but literals were introduced in C++14 + +#include <string_view> +#include <cassert> + +int main() +{ + using namespace std::literals::string_view_literals; + + static_assert ( std::is_same<decltype( "Hi"sv), std::string_view>::value, "" ); + static_assert ( std::is_same<decltype( u8"Hi"sv), std::string_view>::value, "" ); + static_assert ( std::is_same<decltype( L"Hi"sv), std::wstring_view>::value, "" ); + static_assert ( std::is_same<decltype( u"Hi"sv), std::u16string_view>::value, "" ); + static_assert ( std::is_same<decltype( U"Hi"sv), std::u32string_view>::value, "" ); + + std::string_view foo; + std::wstring_view Lfoo; + std::u16string_view ufoo; + std::u32string_view Ufoo; + + foo = ""sv; assert( foo.size() == 0); + foo = u8""sv; assert( foo.size() == 0); + Lfoo = L""sv; assert(Lfoo.size() == 0); + ufoo = u""sv; assert(ufoo.size() == 0); + Ufoo = U""sv; assert(Ufoo.size() == 0); + + foo = " "sv; assert( foo.size() == 1); + foo = u8" "sv; assert( foo.size() == 1); + Lfoo = L" "sv; assert(Lfoo.size() == 1); + ufoo = u" "sv; assert(ufoo.size() == 1); + Ufoo = U" "sv; assert(Ufoo.size() == 1); + + foo = "ABC"sv; assert( foo == "ABC"); assert( foo == std::string_view ( "ABC")); + foo = u8"ABC"sv; assert( foo == u8"ABC"); assert( foo == std::string_view (u8"ABC")); + Lfoo = L"ABC"sv; assert(Lfoo == L"ABC"); assert(Lfoo == std::wstring_view ( L"ABC")); + ufoo = u"ABC"sv; assert(ufoo == u"ABC"); assert(ufoo == std::u16string_view( u"ABC")); + Ufoo = U"ABC"sv; assert(Ufoo == U"ABC"); assert(Ufoo == std::u32string_view( U"ABC")); + + static_assert( "ABC"sv.size() == 3, ""); + static_assert(u8"ABC"sv.size() == 3, ""); + static_assert( L"ABC"sv.size() == 3, ""); + static_assert( u"ABC"sv.size() == 3, ""); + static_assert( U"ABC"sv.size() == 3, ""); +} diff --git a/test/std/strings/string.view/string_view.literals/literal1.fail.cpp b/test/std/strings/string.view/string_view.literals/literal1.fail.cpp new file mode 100644 index 0000000..07878a5 --- /dev/null +++ b/test/std/strings/string.view/string_view.literals/literal1.fail.cpp
@@ -0,0 +1,22 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03, c++11 +// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9 + +#include <string_view> +#include <cassert> + +int main() +{ + using std::string_view; + + string_view foo = ""sv; // should fail w/conversion operator not found +} diff --git a/test/std/strings/string.view/string_view.literals/literal1.pass.cpp b/test/std/strings/string.view/string_view.literals/literal1.pass.cpp new file mode 100644 index 0000000..2481be0 --- /dev/null +++ b/test/std/strings/string.view/string_view.literals/literal1.pass.cpp
@@ -0,0 +1,24 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03, c++11 +// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9 +// Note: libc++ supports string_view before C++17, but literals were introduced in C++14 + +#include <string_view> +#include <cassert> + +int main() +{ + using namespace std::literals; + + std::string_view foo = ""sv; + assert(foo.length() == 0); +} diff --git a/test/std/strings/string.view/string_view.literals/literal2.fail.cpp b/test/std/strings/string.view/string_view.literals/literal2.fail.cpp new file mode 100644 index 0000000..b6194c5 --- /dev/null +++ b/test/std/strings/string.view/string_view.literals/literal2.fail.cpp
@@ -0,0 +1,20 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03, c++11 +// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9 + +#include <string_view> +#include <cassert> + +int main() +{ + std::string_view foo = ""sv; // should fail w/conversion operator not found +} diff --git a/test/std/strings/string.view/string_view.literals/literal2.pass.cpp b/test/std/strings/string.view/string_view.literals/literal2.pass.cpp new file mode 100644 index 0000000..299f27d --- /dev/null +++ b/test/std/strings/string.view/string_view.literals/literal2.pass.cpp
@@ -0,0 +1,24 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03, c++11 +// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9 +// Note: libc++ supports string_view before C++17, but literals were introduced in C++14 + +#include <string_view> +#include <cassert> + +int main() +{ + using namespace std::literals::string_view_literals; + + std::string_view foo = ""sv; + assert(foo.length() == 0); +} diff --git a/test/std/strings/string.view/string_view.literals/literal3.pass.cpp b/test/std/strings/string.view/string_view.literals/literal3.pass.cpp new file mode 100644 index 0000000..dea6635 --- /dev/null +++ b/test/std/strings/string.view/string_view.literals/literal3.pass.cpp
@@ -0,0 +1,24 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03, c++11 +// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9 +// Note: libc++ supports string_view before C++17, but literals were introduced in C++14 + +#include <string_view> +#include <cassert> + +int main() +{ + using namespace std; + + string_view foo = ""sv; + assert(foo.length() == 0); +} diff --git a/www/cxx1z_status.html b/www/cxx1z_status.html index 7c15fdf..22503b9 100644 --- a/www/cxx1z_status.html +++ b/www/cxx1z_status.html
@@ -124,7 +124,7 @@ <tr><td></td><td></td><td></td><td></td><td></td><td></td></tr> <tr><td><a href="http://wg21.link/P0003R5">P0003R5</a></td><td>LWG</td><td>Removing Deprecated Exception Specifications from C++17</td><td>Issaquah</td><td></td><td></td></tr> <tr><td><a href="http://wg21.link/P0067R5">P0067R5</a></td><td>LWG</td><td>Elementary string conversions, revision 5</td><td>Issaquah</td><td></td><td></td></tr> - <tr><td><a href="http://wg21.link/P0403R1">P0403R1</a></td><td>LWG</td><td>Literal suffixes for <tt>basic_string_view</tt></td><td>Issaquah</td><td></td><td></td></tr> + <tr><td><a href="http://wg21.link/P0403R1">P0403R1</a></td><td>LWG</td><td>Literal suffixes for <tt>basic_string_view</tt></td><td>Issaquah</td><td>Complete</td><td>4.0</td></tr> <tr><td><a href="http://wg21.link/P0414R2">P0414R2</a></td><td>LWG</td><td>Merging shared_ptr changes from Library Fundamentals to C++17</td><td>Issaquah</td><td></td><td></td></tr> <tr><td><a href="http://wg21.link/P0418R2">P0418R2</a></td><td>LWG</td><td>Fail or succeed: there is no atomic lattice</td><td>Issaquah</td><td></td><td></td></tr> <tr><td><a href="http://wg21.link/P0426R1">P0426R1</a></td><td>LWG</td><td>Constexpr for <tt>std::char_traits</tt></td><td>Issaquah</td><td></td><td></td></tr>
